From 101d44881c27931cba352180d919488df5cd3b7b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Nov 2001 22:55:28 +0000 Subject: [PATCH] Deprecate. * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not GTK_DISABLE_DEPRECATED. * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. * gdk/tmpl/colors.sgml, gdk/tmpl/pixmaps.sgml, gdk/tmpl/dnd.sgml, gdk/tmpl/gcs.sgml: Document ref and unref functions as deprecated. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gdk/tmpl/colors.sgml | 11 +++++------ docs/reference/gdk/tmpl/dnd.sgml | 4 ++-- docs/reference/gdk/tmpl/gcs.sgml | 12 +++++------- docs/reference/gdk/tmpl/pixmaps.sgml | 11 ++++------- gdk/gdkcolor.c | 16 ++++++++++++++++ gdk/gdkcolor.h | 5 ++++- gdk/gdkdnd.h | 3 +++ gdk/gdkdrawable.h | 3 +++ gdk/gdkgc.c | 16 ++++++++++++++++ gdk/gdkgc.h | 4 ++++ gdk/gdkvisual.h | 2 +- 19 files changed, 159 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4cda4af4f0..61a9abae63 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +2001-11-30 Matthias Clasen + + * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref), + gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref), + gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref): Deprecate. + + * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not + GTK_DISABLE_DEPRECATED. + + * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref), + gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document. + Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 638676e0c5..254f3da867 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2001-11-30 Matthias Clasen + + * gdk/tmpl/colors.sgml, gdk/tmpl/pixmaps.sgml, gdk/tmpl/dnd.sgml, + gdk/tmpl/gcs.sgml: Document ref and unref functions as deprecated. + 2001-11-29 Matthias Clasen * gtk/gtk-sections.sgml: Add GtkTextChildAnchor. diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml index e236541ff6..47396e8f88 100644 --- a/docs/reference/gdk/tmpl/colors.sgml +++ b/docs/reference/gdk/tmpl/colors.sgml @@ -127,20 +127,19 @@ Create a new colormap for the given visual. -Increase the reference count of a colormap. + -@cmap: a #GdkColormap. -@Returns: @cmap +@cmap: +@Returns: -Decrease the reference count of a colormap. If the -resulting reference count is zero, destroys the colormap. + -@cmap: a #GdkColormap. +@cmap: diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml index c6545ceda4..d063784605 100644 --- a/docs/reference/gdk/tmpl/dnd.sgml +++ b/docs/reference/gdk/tmpl/dnd.sgml @@ -82,7 +82,7 @@ Creates a new #GdkDragContext. -Increases the reference count of a drag context by one. +Deprecated function; use g_object_ref() instead. @context: a #GdkDragContext. @@ -154,7 +154,7 @@ which DND is done. -Decreases the reference count of a drag context by one. +Deprecated function; use g_object_unref() instead. @context: a #GdkDragContext. diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml index c4fa8da87e..f78584bdf2 100644 --- a/docs/reference/gdk/tmpl/gcs.sgml +++ b/docs/reference/gdk/tmpl/gcs.sgml @@ -152,21 +152,19 @@ Create a new GC with the given initial values. -Increase the reference count on a graphics context. + -@gc: a #GdkGC. -@Returns: @gc. +@gc: +@Returns: -Decrease the reference count on a graphics context. If -the resulting reference count is zero, the graphics -context will be destroyed. + -@gc: a #GdkGC. +@gc: diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml index 8d1d4ef547..600b54fea0 100644 --- a/docs/reference/gdk/tmpl/pixmaps.sgml +++ b/docs/reference/gdk/tmpl/pixmaps.sgml @@ -149,7 +149,7 @@ in which case a default color will be used. -Increase the reference count of a pixmap. +Deprecated equivalent of g_object_ref(). @pixmap: a #GdkPixmap @@ -158,8 +158,7 @@ Increase the reference count of a pixmap. -Decrease the reference count of a pixmap. If the resulting -reference count is zero, destroy the pixmap. +Deprecated equivalent of g_object_unref(). @pixmap: a #GdkPixmap @@ -177,8 +176,7 @@ refers generically to any of these types. -Increase the reference count of a bitmap. An alias -for gdk_pixmap_ref(). +Deprecated equivalent of g_object_ref(). @Returns: @pixmap @@ -187,8 +185,7 @@ for gdk_pixmap_ref(). -Decrease the reference count of a bitmap. An alias -for gdk_pixmap_unref(). +Deprecated equivalent of g_object_unref(). @pixmap: a #GdkBitmap diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index 9323e3385d..fdf7ae0e07 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -29,12 +29,28 @@ #include "gdkcolor.h" #include "gdkinternals.h" +/** + * gdk_colormap_ref: + * @image: a #GdkColormap + * + * Deprecated function; use g_object_ref() instead. + * + * Return value: the colormap + **/ GdkColormap* gdk_colormap_ref (GdkColormap *cmap) { return (GdkColormap *) g_object_ref (G_OBJECT (cmap)); } +/** + * gdk_colormap_unref: + * @image: a #GdkColormap + * + * Deprecated function; use g_object_ref() instead. + * + * Return value: the colormap + **/ void gdk_colormap_unref (GdkColormap *cmap) { diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h index 569aff64da..e432c98946 100644 --- a/gdk/gdkcolor.h +++ b/gdk/gdkcolor.h @@ -60,13 +60,16 @@ GType gdk_colormap_get_type (void) G_GNUC_CONST; GdkColormap* gdk_colormap_new (GdkVisual *visual, gboolean allocate); + +#ifndef GDK_DISABLE_DEPRECATED GdkColormap* gdk_colormap_ref (GdkColormap *cmap); void gdk_colormap_unref (GdkColormap *cmap); +#endif GdkColormap* gdk_colormap_get_system (void); #ifndef GDK_DISABLE_DEPRECATED gint gdk_colormap_get_system_size (void); -#endif +#endif void gdk_colormap_change (GdkColormap *colormap, gint ncolors); diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index 1eefec4302..c3dd4d1c32 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -78,8 +78,11 @@ struct _GdkDragContextClass { GType gdk_drag_context_get_type (void) G_GNUC_CONST; GdkDragContext * gdk_drag_context_new (void); + +#ifndef GDK_DISABLE_DEPRECATED void gdk_drag_context_ref (GdkDragContext *context); void gdk_drag_context_unref (GdkDragContext *context); +#endif /* Destination side */ diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index 9a529c83ab..e343d8ae62 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -161,8 +161,11 @@ void gdk_drawable_set_colormap (GdkDrawable *drawable, GdkColormap* gdk_drawable_get_colormap (GdkDrawable *drawable); GdkVisual* gdk_drawable_get_visual (GdkDrawable *drawable); gint gdk_drawable_get_depth (GdkDrawable *drawable); + +#ifndef GDK_DISABLE_DEPRECATED GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable); void gdk_drawable_unref (GdkDrawable *drawable); +#endif /* GDK_DISABLE_DEPRECATED */ /* Drawing */ diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index dac4d07982..e1033abfb5 100644 --- a/gdk/gdkgc.c +++ b/gdk/gdkgc.c @@ -122,12 +122,28 @@ gdk_gc_finalize (GObject *object) parent_class->finalize (object); } +/** + * gdk_gc_ref: + * @gc: a #GdkGC + * + * Deprecated function; use g_object_ref() instead. + * + * Return value: the gc. + **/ GdkGC * gdk_gc_ref (GdkGC *gc) { return (GdkGC *) g_object_ref (G_OBJECT (gc)); } +/** + * gdk_gc_unref: + * @gc: a #GdkGC + * + * Deprecated function; use g_object_unref() instead. + * + * Return value: the gc. + **/ void gdk_gc_unref (GdkGC *gc) { diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h index 997809fc9a..4773b40f37 100644 --- a/gdk/gdkgc.h +++ b/gdk/gdkgc.h @@ -191,8 +191,12 @@ GdkGC *gdk_gc_new (GdkDrawable *drawable); GdkGC *gdk_gc_new_with_values (GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask); + +#ifndef GDK_DISABLE_DEPRECATED GdkGC *gdk_gc_ref (GdkGC *gc); void gdk_gc_unref (GdkGC *gc); +#endif + void gdk_gc_get_values (GdkGC *gc, GdkGCValues *values); void gdk_gc_set_values (GdkGC *gc, diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h index bcae03b43f..68334855ff 100644 --- a/gdk/gdkvisual.h +++ b/gdk/gdkvisual.h @@ -80,7 +80,7 @@ GdkVisual* gdk_visual_get_best_with_type (GdkVisualType visual_type); GdkVisual* gdk_visual_get_best_with_both (gint depth, GdkVisualType visual_type); -#ifndef GTK_DISABLE_DEPRECATED +#ifndef GDK_DISABLE_DEPRECATED #define gdk_visual_ref(v) g_object_ref(v) #define gdk_visual_unref(v) g_object_unref(v) #endif -- 2.30.2